Button icons configurable, 0.6.1

diff --git a/modules/engines/ms-windows/ChangeLog.old b/modules/engines/ms-windows/ChangeLog.old
index 8020b9bbea77a7d9182e730ed086c175c6ab40aa..4e6b0a5a33805ba22dd6fb5ca2cdfdddc57ee44a 100755 (executable)
--- a/modules/engines/ms-windows/ChangeLog.old
+++ b/modules/engines/ms-windows/ChangeLog.old
@@ -1,3 +1,11 @@
+2004-07-01  Raymond Penners  <raymond@dotsphinx.com>
+
+       * === Released 0.6.1 ===
+       
+       * src/msw_style.c,src/Theme/gtk-2.0/gtkrc: Removed hard-coded icon
+       button blocking. It is now configurable from within the gtkrc
+       file, but still disabled by default.
+
 2004-06-02  Dom Lachowicz <cinamod@hotmail.com>
 
        * src/msw_style.c: Disable icons in buttons

diff --git a/modules/engines/ms-windows/Theme/gtk-2.0/gtkrc b/modules/engines/ms-windows/Theme/gtk-2.0/gtkrc
index 5ee4374575bb81b7afeed62e62d04d02d340b425..4411c6e347daf06ea43dd0c1ba6d7ccaaea0ff73 100755 (executable)
--- a/modules/engines/ms-windows/Theme/gtk-2.0/gtkrc
+++ b/modules/engines/ms-windows/Theme/gtk-2.0/gtkrc
@@ -1,5 +1,6 @@
 # TODO: we should probably obtain these from a Win32 IconMetrics struct
 gtk-icon-sizes="gtk-menu=12,12:gtk-small-toolbar=12,12:gtk-large-toolbar=16,16:gtk-dnd=32,32"
+gtk-button-images=0
 
 style "msw-default"
 {

diff --git a/modules/engines/ms-windows/msw_style.c b/modules/engines/ms-windows/msw_style.c
index 14ec5ab2fe40490794728bdd4bea66b89d912711..e0050af15835d09b7e4429dcae51d4c08340f0b0 100755 (executable)
--- a/modules/engines/ms-windows/msw_style.c
+++ b/modules/engines/ms-windows/msw_style.c
@@ -453,12 +453,6 @@ setup_menu_settings (GtkSettings * settings)
     if (osvi.dwMajorVersion == 4 && osvi.dwMinorVersion == 0)
       win95 = TRUE;
 
-  if (klazz) {
-    if (g_object_class_find_property (klazz, "gtk-button-images")) {
-      g_object_set (G_OBJECT (settings), "gtk-button-images", 0, NULL);
-    }
-  }
-
   if (!win95) {
     if (SystemParametersInfo (SPI_GETMENUSHOWDELAY, 0, &menu_delay, 0)) {
       if (klazz) {